From c397238109eb3abc855814cb07e931c73b530c5f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Tue, 16 Mar 2004 00:03:59 +0000
Subject: [PATCH] Remove conflict markers.

---
 docs/reference/ChangeLog                  | 5 +++++
 docs/reference/gtk/tmpl/gtktreestore.sgml | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 91d4a8f7e3..84a8571877 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 16 00:13:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/tmpl/gtktreestore.sgml: Remove cvs conflict
+	markers.
+
 Sun Mar 14 22:27:59 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/tmpl/gtktreeview.sgml: Document 
diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml
index d53f2a95d8..39832d3b93 100644
--- a/docs/reference/gtk/tmpl/gtktreestore.sgml
+++ b/docs/reference/gtk/tmpl/gtktreestore.sgml
@@ -209,10 +209,6 @@ drop</link> interfaces.
 @b: 
 
 
-<<<<<<< gtktreestore.sgml
-=======
-
-
 <!-- ##### FUNCTION gtk_tree_store_move_before ##### -->
 <para>
 
@@ -233,6 +229,3 @@ drop</link> interfaces.
 @position: 
 
 
->>>>>>> 1.16
-
-
-- 
2.30.2